commit 8d509d69b434bd70b61cb6eed8b8dc21707726a3
author Zolnai Tamás <tamas.zolnai@collabora.com> Mon Aug 11 14:27:16 2014 +0200
committer Markus Mohrhard <markus.mohrhard@collabora.co.uk> Fri Aug 29 17:40:29 2014 +0200
tree 06960ae502e442781b37b5e7e2fb2f7854ce5984
parent 4e96f7ffdb5d7b84ea70888626523dcdc5dfe0ac

This OpenGL window is useless

Change-Id: Ied9914c9a317dc3945c29b984d2a68957275fc52

sc/source/ui/inc/tabvwsh.hxx

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index d29222f..b20b829 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -189,8 +189,6 @@
    void          DoReadUserDataSequence( const ::com::sun::star::uno::Sequence<
                                     ::com::sun::star::beans::PropertyValue >& rSettings );

    void AddOpenGLChartWindows();

    DECL_LINK( SimpleRefClose, void* );
    DECL_LINK( SimpleRefDone, OUString* );
    DECL_LINK( SimpleRefAborted, OUString* );
@@ -327,7 +325,6 @@
    ObjectSelectionType GetCurObjectSelectionType() { return eCurOST; }

    virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE;
    virtual void Initialize() SAL_OVERRIDE;

    void            StopEditShell();
    bool            IsDrawTextShell() const;

sc/source/ui/view/tabvwsh4.cxx

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 2fc3849..bcc679e 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -571,39 +571,6 @@

}

void ScTabViewShell::AddOpenGLChartWindows()
{
    ScDocument* pDoc = GetViewData().GetDocument();
    ScGridWindow* pParentWindow = GetActiveWin();

    std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> > aCharts = pDoc->GetAllCharts();

    for(std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> >::iterator itr = aCharts.begin(),
            itrEnd = aCharts.end(); itr != itrEnd; ++itr)
    {
        if(!itr->first.is())
            return;
        OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow);

        pOpenGLWindow->Show(false);
        Size aSize = itr->second.GetSize();
        Size aWindowSize = pOpenGLWindow->LogicToPixel( aSize, MapMode( MAP_100TH_MM ) );

        pOpenGLWindow->SetSizePixel(aWindowSize);
        Point aPos = itr->second.TopLeft();
        pOpenGLWindow->SetPosPixel(pOpenGLWindow->LogicToPixel(aPos, MapMode(MAP_100TH_MM)));
        pParentWindow->AddChildWindow(pOpenGLWindow);
        uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( itr->first, uno::UNO_QUERY_THROW );
        sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(pOpenGLWindow);
        x3DWindowProvider->setWindow(nWindowPtr);

        if(isGL3DDiagram(itr->first->getFirstDiagram()))
        {
            x3DWindowProvider->update();
        }
    }
}

// DoReadUserData is also called from ctor when switching from print preview

void ScTabViewShell::DoReadUserData( const OUString& rData )

sc/source/ui/view/tabvwshb.cxx

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 858bfa7..e42950b 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -244,11 +244,6 @@
    return nErr;
}

void ScTabViewShell::Initialize()
{
    AddOpenGLChartWindows();
}

void ScTabViewShell::DeactivateOle()
{
    // deactivate inplace editing if currently active